From: Linus Torvalds Date: Wed, 4 Oct 2006 16:59:57 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~40794 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fefd26b3b8597a11a422d950c0d4424ff33a70ad;p=linux-4.9.git Merge /pub/scm/linux/kernel/git/davej/configh * master.kernel.org:/pub/scm/linux/kernel/git/davej/configh: Remove all inclusions of Manually resolved trivial path conflicts due to removed files in the sound/oss/ subdirectory. --- fefd26b3b8597a11a422d950c0d4424ff33a70ad